Add Mapfactor Navigator with some help from Peder Bredahl Hansen.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4794 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/GPSBabel.pro b/gpsbabel/GPSBabel.pro
index 0db9f93e83505e766978cb30cd7be0f23bb3f3ef..8e7a58ea3d57f0ec9741cb8aac7137b523b9cd38 100644 (file)
--- a/gpsbabel/GPSBabel.pro
+++ b/gpsbabel/GPSBabel.pro
@@ -28,7 +28,7 @@ ALL_FMTS=$$MINIMAL_FMTS gtm.cc gpsutil.cc pcx.cc \
         pocketfms_bc.cc pocketfms_fp.cc pocketfms_wp.cc naviguide.cc enigma.cc \
         vpl.cc teletype.cc jogmap.cc bushnell.cc bushnell_trl.cc wintec_tes.cc \
         subrip.cc garmin_xt.cc garmin_fit.cc lowranceusr4.cc \
-        mtk_locus.cc googledir.cc mapbar_track.cc
+        mtk_locus.cc googledir.cc mapbar_track.cc mapfactor.cc
 
 DEPRECIATED_FMTS=cetus.cc copilot.cc gpspilot.cc magnav.cc psp.cc gcdb.cc quovadis.cc gpilots.cc geoniche.cc palmdoc.cc hsa_ndv.cc coastexp.cc pathaway.cc coto.cc msroute.cc mag_pdb.cc axim_gpb.cc
 

diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in
index 96a9c9c799d022cf457ec4174cb30d83fc1998d4..f9f7cf660c2e45329fafdd306a2bd300ab31963d 100644 (file)
--- a/gpsbabel/Makefile.in
+++ b/gpsbabel/Makefile.in
@@ -80,7 +80,7 @@ ALL_FMTS=$(MINIMAL_FMTS) gtm.o gpsutil.o  \
        pocketfms_bc.o pocketfms_fp.o pocketfms_wp.o naviguide.o enigma.o \
        vpl.o teletype.o jogmap.o bushnell.o bushnell_trl.o wintec_tes.o \
        subrip.o garmin_xt.o garmin_fit.o lowranceusr4.o \
-        mtk_locus.o googledir.o mapbar_track.o
+        mtk_locus.o googledir.o mapbar_track.o mapfactor.o
 
 FMTS=@FMTS@
 

diff --git a/gpsbabel/reference/mapfactor.xml b/gpsbabel/reference/mapfactor.xml
new file mode 100644 (file)
index 0000000..6ff2d74
--- /dev/null
+++ b/gpsbabel/reference/mapfactor.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<favourites version="1">
+  <item name="Hoverdal F1 Sørup sande" lat="202224421" lon="30145835"/>
+  <item name="Hoverdal F2 Hulmose" lat="202269707" lon="30104875"/>
+  <item name="Hoverdal F2-1" lat="202255158" lon="30107287"/>
+  <item name="Hoverdal F3 Oldtidsagre" lat="202274369" lon="30001910"/>
+  <item name="Hoverdal I1" lat="202196320" lon="30474553"/>
+  <item name="Hoverdal I2" lat="202253947" lon="30063905"/>
+  <item name="Hoverdal I3" lat="202210534" lon="30245668"/>
+  <item name="Hoverdal I4 Sø" lat="202243663" lon="30083458"/>
+  <item name="Hoverdal P1" lat="202207154" lon="30294894"/>
+</favourites>

diff --git a/gpsbabel/reference/mapfactor~gpx.gpx b/gpsbabel/reference/mapfactor~gpx.gpx
new file mode 100644 (file)
index 0000000..4040901
--- /dev/null
+++ b/gpsbabel/reference/mapfactor~gpx.gpx
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gpx version="1.0" creator="GPSBabel - http://www.gpsbabel.org" xmlns="http://www.topografix.com/GPX/1/0">
+  <time>1970-01-01T00:00:00Z</time>
+  <bounds minlat="56.165644444" minlon="8.333863889" maxlat="56.187324722" maxlon="8.465153611"/>
+  <wpt lat="56.173450278" lon="8.373843056">
+    <name>Hoverdal F1 Sørup sande</name>
+    <cmt>Hoverdal F1 Sørup sande</cmt>
+    <desc>Hoverdal F1 Sørup sande</desc>
+  </wpt>
+  <wpt lat="56.186029722" lon="8.362465278">
+    <name>Hoverdal F2 Hulmose</name>
+    <cmt>Hoverdal F2 Hulmose</cmt>
+    <desc>Hoverdal F2 Hulmose</desc>
+  </wpt>
+  <wpt lat="56.181988333" lon="8.363135278">
+    <name>Hoverdal F2-1</name>
+    <cmt>Hoverdal F2-1</cmt>
+    <desc>Hoverdal F2-1</desc>
+  </wpt>
+  <wpt lat="56.187324722" lon="8.333863889">
+    <name>Hoverdal F3 Oldtidsagre</name>
+    <cmt>Hoverdal F3 Oldtidsagre</cmt>
+    <desc>Hoverdal F3 Oldtidsagre</desc>
+  </wpt>
+  <wpt lat="56.165644444" lon="8.465153611">
+    <name>Hoverdal I1</name>
+    <cmt>Hoverdal I1</cmt>
+    <desc>Hoverdal I1</desc>
+  </wpt>
+  <wpt lat="56.181651944" lon="8.351084722">
+    <name>Hoverdal I2</name>
+    <cmt>Hoverdal I2</cmt>
+    <desc>Hoverdal I2</desc>
+  </wpt>
+  <wpt lat="56.169592778" lon="8.401574444">
+    <name>Hoverdal I3</name>
+    <cmt>Hoverdal I3</cmt>
+    <desc>Hoverdal I3</desc>
+  </wpt>
+  <wpt lat="56.178795278" lon="8.356516111">
+    <name>Hoverdal I4 Sø</name>
+    <cmt>Hoverdal I4 Sø</cmt>
+    <desc>Hoverdal I4 Sø</desc>
+  </wpt>
+  <wpt lat="56.168653889" lon="8.415248333">
+    <name>Hoverdal P1</name>
+    <cmt>Hoverdal P1</cmt>
+    <desc>Hoverdal P1</desc>
+  </wpt>
+</gpx>

diff --git a/gpsbabel/testo.d/mapfactor.test b/gpsbabel/testo.d/mapfactor.test
new file mode 100644 (file)
index 0000000..4131d33
--- /dev/null
+++ b/gpsbabel/testo.d/mapfactor.test
@@ -0,0 +1,7 @@
+#
+# Mapfactor Navigator
+#
+
+gpsbabel -i mapfactor -f ${REFERENCE}/mapfactor.xml -o gpx -F ${TMPDIR}/mapfactor.gpx -o mapfactor -F ${TMPDIR}/mapfactor.xml
+compare ${REFERENCE}/mapfactor~gpx.gpx ${TMPDIR}/mapfactor.gpx
+compare ${REFERENCE}/mapfactor.xml ${TMPDIR}/mapfactor.xml

diff --git a/gpsbabel/vecs.cc b/gpsbabel/vecs.cc
index fde23d4b1969079abe5bb39f85a44725d8e7ab41..6dfb908c63e49ad4ba029dfb319aa45c39939ed6 100644 (file)
--- a/gpsbabel/vecs.cc
+++ b/gpsbabel/vecs.cc
@@ -175,6 +175,7 @@ extern ff_vecs_t subrip_vecs;
 extern ff_vecs_t format_garmin_xt_vecs;
 extern ff_vecs_t format_fit_vecs;
 extern ff_vecs_t mapbar_track_vecs;
+extern ff_vecs_t mapfactor_vecs;
 
 static
 vecs_t vec_list[] = {
@@ -1060,6 +1061,13 @@ vecs_t vec_list[] = {
     "trk",
     NULL,
   },
+  {
+    &mapfactor_vecs,
+    "mapfactor",
+    "Mapfactor Navigator",
+    "xml",
+    NULL,
+  },
 #endif // MAXIMAL_ENABLED
   {
     NULL,

diff --git a/gpsbabel/xmldoc/formats/mapfactor.xml b/gpsbabel/xmldoc/formats/mapfactor.xml
new file mode 100644 (file)
index 0000000..f59fa97
--- /dev/null
+++ b/gpsbabel/xmldoc/formats/mapfactor.xml
@@ -0,0 +1,23 @@
+<para>
+This format can write a favourites.xml file that stores the waypoints in the Mapfactor Navigator street navigation program for Windows and Android OS. The waypoints are listed in the My places menu option. The favourites.xml file are stored in the Navigator directory.
+</para>
+
+<para>
+This format can read waypoints from the favourites.xml file to use in other programs.
+</para>
+
+
+<para>
+The format has been tested with Windows 8, Navigator version 12.3 and Android OS, v4.2.2, Navigator version 1.1.5.
+</para>
+
+<para>
+The format has been tested with Windows 8, Navigator version 12.3 and Android OS, v4.2.2, Navigator version 1.1.5.
+</para>
+
+<para>
+Groups are not supported, as they don't map well to other more common
+file formats.
+</para>
+
+